-
Notifications
You must be signed in to change notification settings - Fork 7.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(UX): record reason for skipping attendance or marking absent for auto attendance #30844
Merged
ruchamahabal
merged 1 commit into
frappe:develop
from
ruchamahabal:auto-attendance-info
Apr 29, 2022
Merged
fix(UX): record reason for skipping attendance or marking absent for auto attendance #30844
ruchamahabal
merged 1 commit into
frappe:develop
from
ruchamahabal:auto-attendance-info
Apr 29, 2022
+55
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #30844 +/- ##
===========================================
- Coverage 61.83% 61.65% -0.19%
===========================================
Files 1079 1079
Lines 69700 69715 +15
===========================================
- Hits 43100 42981 -119
- Misses 26600 26734 +134
|
|
rootsec1
added a commit
to rootsec1/erpnext
that referenced
this pull request
May 4, 2022
* fix: Allow multi-currency opening invoices * feat: add payment terms status rpr to Selling homepage * fix: Consistent accounting dimensions across Sales and Purchase docs * fix: Ignore custom field validation while setup * chore: Remove domains from Setup * refactor: Remove education domain from ERPNext * chore: remove files related to LMS * chore: clean up hooks * chore: Remove course links from training doctypes * chore: Remove references for Assessment Group * chore: Remove Fees Doctype * chore: Remove references for Student doctype * chore: Add patch to delete education doctypes * chore: Clean up patches * fix: Multi currency opening invoices * fix(UX): record reason for skipping attendance or marking absent for auto attendance (frappe#30844) * fix: Cost center filter on payment reconciliation * fix(minor): discount accounting patch * fix(minor): fix create_accounting_dimensions_in_orders.py * feat: Copy task color from project template (frappe#30857) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> * chore: correct link * fix: convert default_item_manufacturer to link field (frappe#30835) * fix(minor): update frappe.error_log to new API (frappe#30864) * fix(minor): update frappe.error_log to new API * refactor: changes for updated log_error api Co-authored-by: Ankush Menat <ankush@frappe.io> * fix(UX): misleading stock entry lables (frappe#30870) * fix(UX): misleading stock entry lables * chore: field labels [skip ci] Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com> * test: Add test for payment reconciliation * fix: Vat Audit report fixes (cherry picked from commit d5319a4) * fix: Supply type for overseas invoices with payment of tax * fix: supply type for sez invoices with payment of tax * fix(india): e-invoice generation for registered composition gst category type (frappe#30814) * fix: supplier quotation comparission report button * fix: payment days calculation for employees joining/leaving mid-month (frappe#30863) * chore: Resolve conflicts * fix: Ignore loan repayments made from salary slip (cherry picked from commit b7e1d40) * fix: show group warehouse in Sales Order (frappe#30891) * fix: Show linked time sheets in sales invoice dashboard Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: ruthra kumar <ruthra@erpnext.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rushabh Mehta <rmehta@gmail.com> Co-authored-by: sersaber <93864988+sersaber@users.noreply.github.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: maharshivpatel <39730881+maharshivpatel@users.noreply.github.com> Co-authored-by: Francisco Roldán <franciscoproldan@gmail.com>
hrwX
pushed a commit
to hrwX/erpnext
that referenced
this pull request
May 10, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
In the Auto Attendance scheduler job there are multiple reasons why an employee is marked Absent or attendance is skipped for check-in records. The user has to compare the calculated working hours with the shift timings and investigate Employee Check-ins to find out why the employee was marked Absent or why attendance was skipped for the employee.
Fix
Add comments to the Attendance record when the scheduler runs:
For not meeting the working hours threshold:
Due to missing Employee Checkins:
Add relevant comments to Employee Checkin when the scheduler runs:
The Skip Auto Attendance checkbox is editable so this comment is required to distinguish whether it was skipped during the scheduler job or skipping was enabled by the user during log creation:
Adding comments of type "Comment" instead of "Info" because comments are visible in the report view and can be exported.